The two tests keep failing, and then get timed out by Jenkins before they can
print the errors. I've increased the timeout on those two jobs on Jenkins to see
what the failures are.

Note that with these changes if it now takes more than 45 minutes for
run_acceptance_loopback_on_AWS_CentOS_7_for_flocker.acceptance
and run_acceptance_loopback_on_AWS_Ubuntu_Trusty_for_flocker.acceptance
to pass then build.yaml will have to be updated for them.

Pushing to this branch will overwrite my cowboy, so you might want to
change the timeouts in build.yaml if you have to do more work on this
branch, even if they are reverted before merging to master because
a passing run takes less than 45 minutes.

✔️ I'm happy with this, thanks for the improvements.

Merge when you are happy and there are green tests, but I suspect there
may be work to do to get passing tests. A re-review of any changes needed
for that is at your discretion.